From 6bc32a3d5d2dd52d245a6c389214598e240422b0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 7 Apr 2019 17:00:51 +0000
Subject: [PATCH] widget: Drop the pick vfunc

The way to influence picking is to implement contains,
we no longer use the pick vfunc.
---
 gtk/gtkwidget.c | 92 ++++++++++++++++++++++---------------------------
 gtk/gtkwidget.h |  4 ---
 2 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 694217fadf..39ac2bd10b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -828,55 +828,6 @@ gtk_widget_real_contains (GtkWidget *widget,
                                           &GRAPHENE_POINT_INIT (x, y));
 }
 
-static GtkWidget *
-gtk_widget_real_pick (GtkWidget *widget,
-                      gdouble    x,
-                      gdouble    y)
-{
-  GtkWidget *child;
-
-  for (child = _gtk_widget_get_last_child (widget);
-       child;
-       child = _gtk_widget_get_prev_sibling (child))
-    {
-      GtkWidgetPrivate *priv = gtk_widget_get_instance_private (child);
-      GskTransform *transform;
-      graphene_matrix_t inv;
-      GtkWidget *picked;
-      graphene_point3d_t p0, p1, res;
-
-      if (priv->transform)
-        {
-          transform = gsk_transform_invert (gsk_transform_ref (priv->transform));
-          if (transform == NULL)
-            continue;
-        }
-      else
-        {
-          transform = NULL;
-        }
-      gsk_transform_to_matrix (transform, &inv);
-      gsk_transform_unref (transform);
-      graphene_point3d_init (&p0, x, y, 0);
-      graphene_point3d_init (&p1, x, y, 1);
-      graphene_matrix_transform_point3d (&inv, &p0, &p0);
-      graphene_matrix_transform_point3d (&inv, &p1, &p1);
-      if (fabs (p0.z - p1.z) < 1.f / 4096)
-        continue;
-
-      graphene_point3d_interpolate (&p0, &p1, p0.z / (p0.z - p1.z), &res);
-
-      picked = gtk_widget_pick (child, res.x, res.y);
-      if (picked)
-        return picked;
-    }
-
-  if (!gtk_widget_contains (widget, x, y))
-    return NULL;
-
-  return widget;
-}
-
 static void
 gtk_widget_real_grab_notify (GtkWidget *widget,
                              gboolean   was_grabbed)
@@ -982,7 +933,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   klass->get_accessible = gtk_widget_real_get_accessible;
 
   klass->contains = gtk_widget_real_contains;
-  klass->pick = gtk_widget_real_pick;
 
   widget_props[PROP_NAME] =
       g_param_spec_string ("name",
@@ -11079,6 +11029,7 @@ gtk_widget_pick (GtkWidget *widget,
                  gdouble    y)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+  GtkWidget *child;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
@@ -11115,7 +11066,46 @@ gtk_widget_pick (GtkWidget *widget,
         return picked;
     }
 
-  return GTK_WIDGET_GET_CLASS (widget)->pick (widget, x, y);
+  for (child = _gtk_widget_get_last_child (widget);
+       child;
+       child = _gtk_widget_get_prev_sibling (child))
+    {
+      GtkWidgetPrivate *child_priv = gtk_widget_get_instance_private (child);
+      GskTransform *transform;
+      graphene_matrix_t inv;
+      GtkWidget *picked;
+      graphene_point3d_t p0, p1, res;
+
+      if (child_priv->transform)
+        {
+          transform = gsk_transform_invert (gsk_transform_ref (child_priv->transform));
+          if (transform == NULL)
+            continue;
+        }
+      else
+        {
+          transform = NULL;
+        }
+      gsk_transform_to_matrix (transform, &inv);
+      gsk_transform_unref (transform);
+      graphene_point3d_init (&p0, x, y, 0);
+      graphene_point3d_init (&p1, x, y, 1);
+      graphene_matrix_transform_point3d (&inv, &p0, &p0);
+      graphene_matrix_transform_point3d (&inv, &p1, &p1);
+      if (fabs (p0.z - p1.z) < 1.f / 4096)
+        continue;
+
+      graphene_point3d_interpolate (&p0, &p1, p0.z / (p0.z - p1.z), &res);
+
+      picked = gtk_widget_pick (child, res.x, res.y);
+      if (picked)
+        return picked;
+    }
+
+  if (!gtk_widget_contains (widget, x, y))
+    return NULL;
+
+  return widget;
 }
 
 /**
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 8ff503a400..5424d2182d 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -223,7 +223,6 @@ struct _GtkWidget
  *   is changed.
  * @snapshot: Vfunc for gtk_widget_snapshot().
  * @contains: Vfunc for gtk_widget_contains().
- * @pick: Vfunc for gtk_widget_pick().
  */
 struct _GtkWidgetClass
 {
@@ -339,9 +338,6 @@ struct _GtkWidgetClass
   gboolean     (* contains)                    (GtkWidget *widget,
                                                 gdouble    x,
                                                 gdouble    y);
-  GtkWidget *  (* pick)                        (GtkWidget *widget,
-                                                gdouble    x,
-                                                gdouble    y);
 
   /*< private >*/
 
-- 
2.30.2